Merge branch 'wip/carlosg/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Wed, 9 Dec 2020 15:04:01 +0000 (15:04 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 9 Dec 2020 15:04:01 +0000 (15:04 +0000)
Wip/carlosg/for master

Closes #3426 and #3264

See merge request GNOME/gtk!2933


Trivial merge